file-chooser: use an action bar for extra widgets area

https://bugzilla.gnome.org/show_bug.cgi?id=722211

diff --git a/gtk/resources/ui/gtkfilechooserdialog.ui b/gtk/resources/ui/gtkfilechooserdialog.ui
index c08ebd762a63accd70d9df9d611f32c89c5839c0..fa0a3683adaca47cb9db5a75c85d42c67357fd64 100644 (file)
--- a/gtk/resources/ui/gtkfilechooserdialog.ui
+++ b/gtk/resources/ui/gtkfilechooserdialog.ui
@@ -13,9 +13,10 @@
         <property name="border_width">0</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="spacing">0</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="border_width">6</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>

diff --git a/gtk/resources/ui/gtkfilechooserwidget.ui b/gtk/resources/ui/gtkfilechooserwidget.ui
index 9752e210e1657f36cd29cdf8b7b69531688a6d27..1a0751c89dbd171169a710d40c347dfc82dd2eed 100644 (file)
--- a/gtk/resources/ui/gtkfilechooserwidget.ui
+++ b/gtk/resources/ui/gtkfilechooserwidget.ui
@@ -347,18 +347,13 @@
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="extra_and_filters">
+      <object class="GtkActionBar" id="extra_and_filters">
         <property name="visible">True</property>
-        <property name="border_width">10</property>
         <child>
           <object class="GtkBox" id="extra_align">
             <property name="can_focus">False</property>
+            <property name="spacing">12</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="filter_combo_hbox">
@@ -386,10 +381,7 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="pack_type">end</property>
-            <property name="position">1</property>
           </packing>
         </child>
       </object>